From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 19 Sep 2011 03:06:00 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2115^2~5
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=1f54f645c58b11ec4e7b83de19defa9208e22e92;p=emacs.git

Merge from trunk.
---

1f54f645c58b11ec4e7b83de19defa9208e22e92